Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump aw-server-rust #22

Merged
merged 1 commit into from
Jun 11, 2024
Merged

Bump aw-server-rust #22

merged 1 commit into from
Jun 11, 2024

Conversation

wojnilowicz
Copy link
Contributor

Please test before merging. I only tested the unbundled version.

@2e3s
Copy link
Owner

2e3s commented Jun 11, 2024

Thanks! I will make further adjustments

@2e3s 2e3s merged commit cfb3ad8 into 2e3s:main Jun 11, 2024
0 of 4 checks passed
@wojnilowicz
Copy link
Contributor Author

Thanks. I see that you went with your own fork of ActivityWatch. That's bad for me, because I couldn't bump it again. Secondly, I bumped it because I would like to package it for Fedora and wanted to use official (also packaged by me) and the latest (requirement of Fedora packaging) aw-server-rust package to build your watcher.

Did you fork because you're going to diverge from the original ActivityWatch?

@2e3s
Copy link
Owner

2e3s commented Jun 11, 2024

I temporarily referred my fork to test it out in CI before releasing (postponed to figure out probable issues in #23). I have returned it back after my fix was merged in ActivityWatch/aw-server-rust#484

@2e3s
Copy link
Owner

2e3s commented Jun 11, 2024

But even if I use a patched fork for awatcher, I don't think it would make any problem for you and the binaries distribution. The build will take whatever dependencies it needs, it doesn't conflict with the aw-server-rust. For Cargo, 2e3s/aw-server-rust and ActivityWatch/aw-server-rust are different codebases.

@wojnilowicz
Copy link
Contributor Author

But even if I use a patched fork for awatcher, I don't think it would make any problem for you and the binaries distribution. The build will take whatever dependencies it needs, it doesn't conflict with the aw-server-rust. For Cargo, 2e3s/aw-server-rust and ActivityWatch/aw-server-rust are different codebases.

I'm not sure what you mean, but in order to package it in Fedora, I have to prepackage every dependency of it. Rust (and other) dependencies are not downloaded from the internet but from local repository. If you would make your own fork then I would have to package it as a separate package (and separate to the official on at ActivityWatch) as well. At least in theory.

Anyway, thanks for returning to the official ActivityWatch source. It's always easier to follow upstream.

@2e3s
Copy link
Owner

2e3s commented Jun 11, 2024

but in order to package it in Fedora, I have to prepackage every dependency of it

All of this https://github.com/2e3s/awatcher/blob/main/watchers/Cargo.toml#L17 is just crates/libraries: aw-client-rust, wayland-client, x11rb, zbus, toml, log, etc, which are downloaded from crates.io or directly from git in order to be built. Not sure about the process, if Fedora's is like Debian's then it would be very problematic. So either you're doing a ton of work as a maintainer to keep up all related librust-{crate}-dev and alike, or maybe there is some misunderstanding 🙂

@wojnilowicz
Copy link
Contributor Author

Fedora is like Debian in this matter.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants